Merge branch 'upstream'
authorBernd Zeimetz <bernd@bzed.de>
Fri, 24 Jul 2009 20:56:05 +0000 (22:56 +0200)
committerBernd Zeimetz <bernd@bzed.de>
Fri, 24 Jul 2009 20:56:05 +0000 (22:56 +0200)

Trivial merge